From: Jim Blandy <jimb@redhat.com>
Date: Sun, 23 May 1993 20:01:34 +0000 (+0000)
Subject: * xfaces.c (Fset_face_attribute_internal): Don't free the frame's
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~96079
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=173004a3a4d9240f9ebaf5cf504c094ff773f68d;p=emacs.git

* xfaces.c (Fset_face_attribute_internal): Don't free the frame's
	normal_gc or reverse_gc.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 5638ed65d5f..4c053f663fa 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -903,7 +903,9 @@ DEFUN ("set-face-attribute-internal", Fset_face_attribute_internal,
   if (id == 0)
     {
       BLOCK_INPUT;
-      if (FRAME_DEFAULT_FACE (f)->gc != 0)
+      if (FRAME_DEFAULT_FACE (f)->gc != 0
+	  && FRAME_DEFAULT_FACE (f)->gc != f->display.x->normal_gc
+	  && FRAME_DEFAULT_FACE (f)->gc != f->display.x->reverse_gc)
 	XFreeGC (x_current_display, FRAME_DEFAULT_FACE (f)->gc);
       build_face (f, FRAME_DEFAULT_FACE (f));
       UNBLOCK_INPUT;
@@ -912,7 +914,9 @@ DEFUN ("set-face-attribute-internal", Fset_face_attribute_internal,
   if (id == 1)
     {
       BLOCK_INPUT;
-      if (FRAME_MODE_LINE_FACE (f)->gc != 0)
+      if (FRAME_MODE_LINE_FACE (f)->gc != 0
+	  && FRAME_MODE_LINE_FACE (f)->gc != f->display.x->normal_gc
+	  && FRAME_MODE_LINE_FACE (f)->gc != f->display.x->reverse_gc)
 	XFreeGC (x_current_display, FRAME_MODE_LINE_FACE (f)->gc);
       build_face (f, FRAME_MODE_LINE_FACE (f));
       UNBLOCK_INPUT;